Merge main branch and resolve conflicts in templateParser and helpers tests #33
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* restart on config change * add secure API * add API key checking, timeouts, CORS, etc to API * Add tests for API * minor API updates, docs * bugfix: can't traverse host directory * ci: run on any PR * eslint: fix any types * bugfix: build types * build: force npm build in lint phase * eslint: add docs for overrides * resolve merges --------- Co-authored-by: Stone Gray <stone@stone.local>
* restart on config change * add secure API * add API key checking, timeouts, CORS, etc to API * Add tests for API * minor API updates, docs * bugfix: can't traverse host directory * ci: run on any PR * eslint: fix any types * bugfix: build types * build: force npm build in lint phase * eslint: add docs for overrides * resolve merges * Add runtime checks to templates to prevent various test failures * Add test coverage for 3dc4bcd * Update test/unit/traefik/template-validation.test.ts Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Stone Gray <stone@stone.local> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Update CI builds
Traefik: Allow nested access to properties
* update readme * remove old test stuff --------- Co-authored-by: Stone Gray <stone@stone.local>
Co-authored-by: stonegray <7140974+stonegray@users.noreply.github.com>
…ix config types Co-authored-by: stonegray <7140974+stonegray@users.noreply.github.com>
Co-authored-by: stonegray <7140974+stonegray@users.noreply.github.com>
Address review feedback: enhance type safety and test coverage
Autonomous Refactor
Co-authored-by: stonegray <7140974+stonegray@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Fix deep merge issue and enhance config robustness
Merge main branch and resolve conflicts in templateParser and helpers tests
Jan 15, 2026
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merged main branch into PR branch to resolve divergence. Two files had conflicts requiring manual resolution.
Conflict Resolutions
src/backends/traefik/templateParser.ts
test/unit/traefik/helpers.test.ts
Ancillary changes
config.ts(usedas constinstead of explicit type + value)Verification
✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.